diff options
| author | abs <abs> | 2003-10-01 11:56:17 +0000 |
|---|---|---|
| committer | abs <abs> | 2003-10-01 11:56:17 +0000 |
| commit | 49191f4a4d874eae0c8890bb8d93c72edf390d98 (patch) | |
| tree | c764b4c0ed48f65e47cb2c4fd8a95bc98e2bea6b | |
| parent | 6ca3a4b68c2b4ba8914211e84a9dd46cadd49b4c (diff) | |
| download | pkgsrc-49191f4a4d874eae0c8890bb8d93c72edf390d98.tar.gz | |
Update pkglint to 3.63:
perl 5.6.1 realpath() cannot handle files, only directories.
Handle this case, with the only downside that if the last component in
an include path is a symlink the 'performance boost' duplicate check
may not work. Reported by Todd Vierling
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 4817f64169d..4c4ab608f3c 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.3602 2003/10/01 11:31:33 abs Exp $ +$NetBSD: CHANGES,v 1.3603 2003/10/01 11:56:53 abs Exp $ Changes to the packages collection and infrastructure in 2003: @@ -4037,4 +4037,5 @@ Changes to the packages collection and infrastructure in 2003: Added rinetd 0.62 [grant 2003-10-01] Added exif 0.6 [itojun 2003-10-01] Updated pkgchk to 1.43 [abs 2003-10-01] + Updated pkglint to 3.63 [abs 2003-10-01] diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index c4f125fe06f..29b706ac101 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.169 2003/09/30 16:09:50 abs Exp $ +# $NetBSD: Makefile,v 1.170 2003/10/01 11:56:17 abs Exp $ # -DISTNAME= pkglint-3.62 +DISTNAME= pkglint-3.63 WRKSRC= ${WRKDIR} CATEGORIES= pkgtools devel MASTER_SITES= # empty diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index e0d4e65b7ce..3a681128b5a 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #!@PREFIX@/bin/perl -# $NetBSD: lintpkgsrc.pl,v 1.83 2003/09/30 16:09:50 abs Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.84 2003/10/01 11:56:17 abs Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -886,7 +886,12 @@ sub parse_makefile_vars if (substr($incfile, 0, 1) ne '/') { $incfile = "$CURDIR/$incfile"; } - $incfile = realpath($incfile); + # perl 5.6.1 realpath() cannot handle files, only directories + # If the last component is a symlink this will give a false + # negative, but that is not a problem as the duplicate check + # is for performance + $incfile =~ m#^(.+)(/[^/]+)$#; + $incfile = realpath($1).$2; if (!$incfiles{$incfile}) { |