[pkgsrc/trunk]: pkgsrc/pkgtools/pkgdiff pkgdiff: Update to 1.10.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/56c2549f69b1
branches:  trunk
changeset: 378871:56c2549f69b1
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Sun May 08 12:29:51 2022 +0000

description:
pkgdiff: Update to 1.10.

Unlink files in mkpatches before new files are moved into place.  Avoids .nfs*
warts when creating patches on an NFS file system.

diffstat:

 pkgtools/pkgdiff/Makefile           |  5 ++---
 pkgtools/pkgdiff/files/mkpatches.pl |  6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r 04b59ddd424b -r 56c2549f69b1 pkgtools/pkgdiff/Makefile
--- a/pkgtools/pkgdiff/Makefile Sun May 08 12:25:18 2022 +0000
+++ b/pkgtools/pkgdiff/Makefile Sun May 08 12:29:51 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.99 2021/08/06 01:29:27 gutteridge Exp $
+# $NetBSD: Makefile,v 1.100 2022/05/08 12:29:51 jperkin Exp $
 
-PKGNAME=       pkgdiff-1.9
-PKGREVISION=   2
+PKGNAME=       pkgdiff-1.10
 CATEGORIES=    pkgtools devel
 
 MAINTAINER=    wiz%NetBSD.org@localhost
diff -r 04b59ddd424b -r 56c2549f69b1 pkgtools/pkgdiff/files/mkpatches.pl
--- a/pkgtools/pkgdiff/files/mkpatches.pl       Sun May 08 12:25:18 2022 +0000
+++ b/pkgtools/pkgdiff/files/mkpatches.pl       Sun May 08 12:29:51 2022 +0000
@@ -1,6 +1,6 @@
 #!@PERL5@
 #
-# $NetBSD: mkpatches.pl,v 1.22 2019/08/21 13:00:06 hauke Exp $
+# $NetBSD: mkpatches.pl,v 1.23 2022/05/08 12:29:51 jperkin Exp $
 #
 # mkpatches: creates a set of patches patch-aa, patch-ab, ...
 #   in work/.newpatches by looking for *.orig files in and below
@@ -147,6 +147,7 @@
        my $orig = $_;
        my $new = $_;
        $new =~ s/.orig$//;
+       unlink $new;
        rename $orig, $new;
        if (! -s $new) {
            unlink $new;
@@ -246,6 +247,7 @@
        chomp $filename;
        next if $filename =~ m/.orig$/;
        if (-f "$filename" and not -f "$filename.orig") {
+           unlink "$filename.orig";
            rename "$filename", "$filename.orig";
        }
     }
@@ -276,6 +278,7 @@
     if ("$diff" eq "") {
        print "$old and $new don't differ\n";
        if (-f "$patchdir/$patchfile.orig") {
+           unlink "$patchdir/$patchfile";
            rename "$patchdir/$patchfile.orig", "$patchdir/$patchfile";
        }
     }
@@ -319,6 +322,7 @@
        # all fine, keep diff
     } else {
        # restore previous version to get rid of uninteresting diffs
+       unlink "$patchdir/$patchfile";
        rename "$patchdir/$patchfile.orig", "$patchdir/$patchfile";
     }