CVS commit: pkgsrc/pkgtools/pkgdiff

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Dec 27 16:10:45 UTC 2025

Modified Files:
        pkgsrc/pkgtools/pkgdiff: Makefile
        pkgsrc/pkgtools/pkgdiff/files: pkgdiff

Log Message:
pkgdiff-1.13: don't combine -q with other output options

Certain versions of BSD diff will error when -q is combined with
.e.g -U to provide an unified output. In GNU diff, when -q is combined
with other options, it overrides them, exiting early with an indicator
of whether the files are different or not, so this doesn't affect GNU
diff.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/pkgtools/pkgdiff/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/pkgtools/pkgdiff/files/pkgdiff

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.105 pkgsrc/pkgtools/pkgdiff/Makefile:1.106
--- pkgsrc/pkgtools/pkgdiff/Makefile:1.105      Tue Aug  6 03:56:10 2024
+++ pkgsrc/pkgtools/pkgdiff/Makefile    Sat Dec 27 16:10:45 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.105 2024/08/06 03:56:10 tnn Exp $
+# $NetBSD: Makefile,v 1.106 2025/12/27 16:10:45 nia Exp $
 
-PKGNAME=       pkgdiff-1.12
+PKGNAME=       pkgdiff-1.13
 CATEGORIES=    pkgtools devel
 
 MAINTAINER=    wiz%NetBSD.org@localhost

Index: pkgsrc/pkgtools/pkgdiff/files/pkgdiff
diff -u pkgsrc/pkgtools/pkgdiff/files/pkgdiff:1.24 pkgsrc/pkgtools/pkgdiff/files/pkgdiff:1.25
--- pkgsrc/pkgtools/pkgdiff/files/pkgdiff:1.24  Tue Aug  6 03:56:10 2024
+++ pkgsrc/pkgtools/pkgdiff/files/pkgdiff       Sat Dec 27 16:10:45 2025
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: pkgdiff,v 1.24 2024/08/06 03:56:10 tnn Exp $
+# $NetBSD: pkgdiff,v 1.25 2025/12/27 16:10:45 nia Exp $
 #
 # Usage: pkgdiff newfile
 #        pkgdiff oldfile newfile
@@ -126,7 +126,7 @@ PKGDIFF_FMT="${PKGDIFF_FMT} -U $lines"
 ;;
 esac # PKGDIFF_FMT unset or null
 
-if dodiff -q $PKGDIFF_FMT "$old" "$new" > /dev/null
+if dodiff -q "$old" "$new" > /dev/null
 then
        :
 else