CVS commit: pkgsrc/pkgtools/pkgdiff

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sun May  8 12:29:51 UTC 2022

Modified Files:
        pkgsrc/pkgtools/pkgdiff: Makefile
        pkgsrc/pkgtools/pkgdiff/files: mkpatches.pl

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/pkgtools/pkgdiff/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/pkgtools/pkgdiff/files/mkpatches.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/pkgdiff/Makefile
diff -u pkgsrc/pkgtools/pkgdiff/Makefile:1.99 pkgsrc/pkgtools/pkgdiff/Makefile:1.100
--- pkgsrc/pkgtools/pkgdiff/Makefile:1.99       Fri Aug  6 01:29:27 2021
+++ pkgsrc/pkgtools/pkgdiff/Makefile    Sun May  8 12:29:51 2022
@@ -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

Index: pkgsrc/pkgtools/pkgdiff/files/mkpatches.pl
diff -u pkgsrc/pkgtools/pkgdiff/files/mkpatches.pl:1.22 pkgsrc/pkgtools/pkgdiff/files/mkpatches.pl:1.23
--- pkgsrc/pkgtools/pkgdiff/files/mkpatches.pl:1.22     Wed Aug 21 13:00:06 2019
+++ pkgsrc/pkgtools/pkgdiff/files/mkpatches.pl  Sun May  8 12:29:51 2022
@@ -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 @@ if ($opt_r) {
        my $orig = $_;
        my $new = $_;
        $new =~ s/.orig$//;
+       unlink $new;
        rename $orig, $new;
        if (! -s $new) {
            unlink $new;
@@ -246,6 +247,7 @@ sub move_away_old_patches
        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 @@ sub make_patch # new old patchfile diff
     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 @@ sub make_patch # new old patchfile diff
        # all fine, keep diff
     } else {
        # restore previous version to get rid of uninteresting diffs
+       unlink "$patchdir/$patchfile";
        rename "$patchdir/$patchfile.orig", "$patchdir/$patchfile";
     }