pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update pkglint to 3.63:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/368066459883
branches:  trunk
changeset: 462381:368066459883
user:      abs <abs%pkgsrc.org@localhost>
date:      Wed Oct 01 11:56:17 2003 +0000

description:
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

diffstat:

 doc/CHANGES                          |  3 ++-
 pkgtools/pkglint/Makefile            |  4 ++--
 pkgtools/pkglint/files/lintpkgsrc.pl |  9 +++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r ee44525e5161 -r 368066459883 doc/CHANGES
--- a/doc/CHANGES       Wed Oct 01 11:31:33 2003 +0000
+++ b/doc/CHANGES       Wed Oct 01 11:56:17 2003 +0000
@@ -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 @@
        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 -r ee44525e5161 -r 368066459883 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Wed Oct 01 11:31:33 2003 +0000
+++ b/pkgtools/pkglint/Makefile Wed Oct 01 11:56:17 2003 +0000
@@ -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 -r ee44525e5161 -r 368066459883 pkgtools/pkglint/files/lintpkgsrc.pl
--- a/pkgtools/pkglint/files/lintpkgsrc.pl      Wed Oct 01 11:31:33 2003 +0000
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl      Wed Oct 01 11:56:17 2003 +0000
@@ -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@localhost>.
 #
@@ -886,7 +886,12 @@
                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})
                    {



Home | Main Index | Thread Index | Old Index