CVS commit: pkgsrc/pkgtools/lintpkgsrc

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sat Mar 21 02:20:57 UTC 2026

Modified Files:
        pkgsrc/pkgtools/lintpkgsrc: Makefile
        pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.1 lintpkgsrc.pl

Log Message:
lintpkgsrc: minor error handling and doc fixes

If unable to unlink a file, report this. While here, also fix incorrect
substitutions in the man page generation.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/pkgtools/lintpkgsrc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.1
cvs rdiff -u -r1.130 -r1.131 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/lintpkgsrc/Makefile
diff -u pkgsrc/pkgtools/lintpkgsrc/Makefile:1.56 pkgsrc/pkgtools/lintpkgsrc/Makefile:1.57
--- pkgsrc/pkgtools/lintpkgsrc/Makefile:1.56    Thu Sep 29 21:26:23 2022
+++ pkgsrc/pkgtools/lintpkgsrc/Makefile Sat Mar 21 02:20:57 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2022/09/29 21:26:23 rillig Exp $
+# $NetBSD: Makefile,v 1.57 2026/03/21 02:20:57 gutteridge Exp $
 
-PKGNAME=       lintpkgsrc-2022.09.29
+PKGNAME=       lintpkgsrc-2026.03.21
 CATEGORIES=    pkgtools
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.1
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.1:1.6 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.1:1.7
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.1:1.6   Wed Aug 10 22:43:55 2022
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.1       Sat Mar 21 02:20:57 2026
@@ -1,4 +1,4 @@
-.\"    $NetBSD: lintpkgsrc.1,v 1.6 2022/08/10 22:43:55 rillig Exp $
+.\"    $NetBSD: lintpkgsrc.1,v 1.7 2026/03/21 02:20:57 gutteridge Exp $
 .\"
 .\" Copyright (c) 1999 by David Brownlee (abs%netbsd.org@localhost)
 .\" Absolutely no warranty.
@@ -73,7 +73,7 @@ Check the version of each installed pack
 pkgsrc.
 .It Fl K Ar PACKAGES
 Override binary packages base directory, normally set from
-.Pa @MAKECONF@
+.Pa @LINTPKGSRC_MAKECONF@
 or defaulted to
 .Pa ${PKGSRCDIR}/packages .
 .Pp
@@ -86,7 +86,7 @@ and
 check for
 binary packages in any depth of PACKAGES subdirs - this allows packages for all
 architectures/OS versions to be checked simultaneously with a
-.Pa @MAKECONF@
+.Pa @LINTPKGSRC_MAKECONF@
 construct of the form:
 .Bd -literal
 \&.ifdef LINTPKGSRC
@@ -118,9 +118,9 @@ This is intended to help those making bi
 Report any old distfiles (not referenced by any package's distinfo file).
 .It Fl P Ar PKGSRCDIR
 Set base of pkgsrc tree, normally set from
-.Pa @MAKECONF@
+.Pa @LINTPKGSRC_MAKECONF@
 or defaulted to
-.Pa @PREFIX@ .
+.Pa @PKGSRCDIR@ .
 .It Fl p
 Report any old binary packages in any subdirs of
 .Em PACKAGES .
@@ -179,7 +179,7 @@ In this case
 can be overridden with
 .Fl K
 or set conditionally in
-.Pa @MAKECONF@
+.Pa @LINTPKGSRC_MAKECONF@
 based on the value of
 .Em LINTPKGSRC .
 .Pp

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.130 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.131
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.130        Mon Oct 16 22:16:55 2023
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Sat Mar 21 02:20:57 2026
@@ -1,5 +1,5 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.130 2023/10/16 22:16:55 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.131 2026/03/21 02:20:57 gutteridge Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -1364,7 +1364,8 @@ sub check_distfiles($pkgsrcdir, $pkgdist
        return unless $opt{r};
        verbose("Unlinking unreferenced distfiles\n");
        foreach my $distfile (@unref_distfiles) {
-               unlink("$pkgdistdir/$distfile");
+               unlink("$pkgdistdir/$distfile")
+                   or warn "Could not unlink $pkgdistdir/$distfile: $!";
        }
 }
 
@@ -1390,6 +1391,7 @@ sub remove_orphaned_distfiles($dldistfil
                verbose("Unlinking 'orphaned' distfiles\n");
                foreach my $distfile (@orphan) {
                        unlink("$pkgdistdir/$distfile")
+                           or warn "Could not unlink $pkgdistdir/$distfile: $!";
                }
        }
 }
@@ -1415,7 +1417,8 @@ sub remove_parented_distfiles($dldistfil
        if ($opt{r}) {
                verbose("Unlinking 'parented' distfiles\n");
                foreach my $distfile (@parent) {
-                       unlink("$pkgdistdir/$distfile");
+                       unlink("$pkgdistdir/$distfile")
+                           or warn "Could not unlink $pkgdistdir/$distfile: $!";
                }
        }
 }
@@ -1487,7 +1490,7 @@ sub list_prebuilt_packages($pkgsrcdir) {
        return unless $opt{r};
        verbose("Unlinking listed prebuilt packages\n");
        foreach my $pkgfile (@matched_prebuiltpackages) {
-               unlink($pkgfile);
+               unlink($pkgfile) or warn "Could not unlink $pkgfile: $!";
        }
 }