Updated pkglint to 4.40.

- Removed all references to the build-time pkgsrc directory, ${PKGSRCDIR}.
  This makes the binary package independent of the build location.
  Fixes PR 32006.

5 files changed, 12 insertions, 19 deletions

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index e88a8bbd372..2406c2136de 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.291 2005/11/10 11:03:57 rillig Exp $
+# $NetBSD: Makefile,v 1.292 2005/11/10 14:30:56 rillig Exp $
 #
 
-DISTNAME=	pkglint-4.39
+DISTNAME=	pkglint-4.40
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -27,9 +27,7 @@ SUBST_CLASSES+=		pkglint
 SUBST_STAGE.pkglint=	post-configure
 SUBST_FILES.pkglint+=	lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl
 SUBST_FILES.pkglint+=	pkglint.0 pkglint.1 pkglint.pl
-SUBST_FILES.pkglint+=	plist-clash.pl
 SUBST_SED.pkglint+=	-e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.pkglint+=	-e 's|@PKGSRCDIR@|${PKGSRCDIR}|g'
 SUBST_SED.pkglint+=	-e 's|@DISTVER@|${DISTNAME:S/pkglint-//}|g'
 SUBST_SED.pkglint+=	-e 's|@MAKE@|${MAKE}|g'
 SUBST_SED.pkglint+=	-e 's|@PERL@|${PERL5}|g'
@@ -42,7 +40,7 @@ MANINSTALL=		catinstall
 .endif
 
 do-extract:
-.for f in ${SUBST_FILES.pkglint}
+.for f in lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl pkglint.0 pkglint.1 pkglint.pl plist-clash.pl
 	@${CP} ${FILESDIR}/${f} ${WRKSRC}/${f}
 .endfor
 
diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl
index 9f7b0ed6005..98c887d7d69 100755
--- a/pkgtools/pkglint/files/lintpkgsrc.pl
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl
@@ -1,6 +1,6 @@
 #!@PERL@
 
-# $NetBSD: lintpkgsrc.pl,v 1.104 2005/11/08 23:05:22 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.105 2005/11/10 14:30:56 rillig Exp $
 
 # Written by David Brownlee <abs@netbsd.org>.
 #
@@ -440,7 +440,7 @@ sub get_default_makefile_vars
     if ($opt{P})
 	{ $default_vars->{PKGSRCDIR} = $opt{P}; }
     else
-	{ $default_vars->{PKGSRCDIR} = '@PKGSRCDIR@'; }
+	{ $default_vars->{PKGSRCDIR} = '/usr/pkgsrc'; }
 
     $default_vars->{DESTDIR} = '';
     $default_vars->{LOCALBASE} = '/usr/pkg';
@@ -1391,7 +1391,7 @@ Misc:
 Modifiers:
   -K path : Set PACKAGES basedir (default PKGSRCDIR/packages)
   -M path : Set DISTDIR		 (default PKGSRCDIR/distfiles)
-  -P path : Set PKGSRCDIR	 (default @PKGSRCDIR@)
+  -P path : Set PKGSRCDIR	 (default /usr/pkgsrc)
   -D      : Debug makefile and glob parsing
   -L      : List each Makefile when scanned
 ";
diff --git a/pkgtools/pkglint/files/pkglint.0 b/pkgtools/pkglint/files/pkglint.0
index 15857828e87..07f15ac9fd9 100644
--- a/pkgtools/pkglint/files/pkglint.0
+++ b/pkgtools/pkglint/files/pkglint.0
@@ -95,8 +95,7 @@ DDEESSCCRRIIPPTTIIOONN
                                ted, the current directory is checked.
 
 FFIILLEESS
-     @PKGSRCDIR@/mk/bsd.pkg.mk  The pkgsrc master Makefile.
-     @PKGSRCDIR@/*              Other pkgsrc files.
+     pkgsrc/mk/*  Files from the pkgsrc infrastructure.
 
 EEXXAAMMPPLLEESS
      ppkkgglliinntt --CCnnoonnee,,ppaattcchheess ..
diff --git a/pkgtools/pkglint/files/pkglint.1 b/pkgtools/pkglint/files/pkglint.1
index 94ce8d5b5a4..0d17ee65d65 100644
--- a/pkgtools/pkglint/files/pkglint.1
+++ b/pkgtools/pkglint/files/pkglint.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkglint.1,v 1.24 2005/11/04 09:32:03 rillig Exp $
+.\"	$NetBSD: pkglint.1,v 1.25 2005/11/10 14:30:56 rillig Exp $
 .\"	From FreeBSD: portlint.1,v 1.8 1997/11/25 14:53:14 itojun Exp
 .\"
 .\" Copyright (c) 1997 by Jun-ichiro Itoh <itojun@itojun.org>.
@@ -110,11 +110,9 @@ The pkgsrc directories to be checked.
 If omitted, the current directory is checked.
 .El
 .Sh FILES
-.Bl -tag -width /usr/pkgsrc/mk/bsd.pkg.mk -compact
-.It Pa @PKGSRCDIR@/mk/bsd.pkg.mk
-The pkgsrc master Makefile.
-.It Pa @PKGSRCDIR@/*
-Other pkgsrc files.
+.Bl -tag -width pkgsrc/mk/* -compact
+.It Pa pkgsrc/mk/*
+Files from the pkgsrc infrastructure.
 .El
 .Sh EXAMPLES
 .Bl -tag -width Fl
diff --git a/pkgtools/pkglint/files/plist-clash.pl b/pkgtools/pkglint/files/plist-clash.pl
index 0048d8d2dc8..4e3b70ba06d 100644
--- a/pkgtools/pkglint/files/plist-clash.pl
+++ b/pkgtools/pkglint/files/plist-clash.pl
@@ -1,11 +1,9 @@
 #! @PERL@
-# $NetBSD: plist-clash.pl,v 1.4 2005/10/24 20:56:53 rillig Exp $
+# $NetBSD: plist-clash.pl,v 1.5 2005/11/10 14:30:56 rillig Exp $
 #
 # Scan all PLIST files given on the command line and report all lines
 # that appear more than once.
 
-my $conf_rootdir = '@PKGSRCDIR@';
-
 my %files = ();
 
 sub read_PLIST($) {